Merge.

author ssmith@localhost.localdomain <ssmith@localhost.localdomain>

Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)

committer ssmith@localhost.localdomain <ssmith@localhost.localdomain>

Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
author ssmith@localhost.localdomain <ssmith@localhost.localdomain>
Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
committer ssmith@localhost.localdomain <ssmith@localhost.localdomain>
Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
diff --cc xen/arch/x86/mm.c
Simple merge
diff --cc xen/arch/x86/mm/shadow/common.c
Simple merge
author	ssmith@localhost.localdomain <ssmith@localhost.localdomain>
	Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
committer	ssmith@localhost.localdomain <ssmith@localhost.localdomain>
	Mon, 11 Dec 2006 19:17:11 +0000 (11:17 -0800)
		1	2
xen/arch/x86/mm.c	patch \|	diff1 \|	diff2 \|	blob \| history
xen/arch/x86/mm/shadow/common.c	patch \|	diff1 \|	diff2 \|	blob \| history